merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 15 Dec 2011 07:51:01 +0000 (16:51 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 15 Dec 2011 07:51:01 +0000 (16:51 +0900)
commit7d77cd972775978cd7dcf527a70cac3f24151297
treec698ad7c122c7ea6d07924ba43fc503e4fe71a07
parenta927ac98913b5f3966638a5a44b917387246c392
parent11ed5675b53131a5d00a0e8ff1848ddd43641b5f
merge trunk